05:46
2026-05-26
dev.to
ai-tools
I made git merge finish itself — in VS Code, in my terminal, and in CI
A developer built Merge Magic, an open-source tool that automatically resolves additive merge conflicts in VS Code, the terminal, and CI pipelines. The tool uses a three-layer approach—text-based reso…